projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b807560
)
* image.c (x_from_xcolors): Remove unused local.
author
Paul Eggert
<eggert@cs.ucla.edu>
Fri, 28 Jun 2013 05:48:53 +0000
(22:48 -0700)
committer
Paul Eggert
<eggert@cs.ucla.edu>
Fri, 28 Jun 2013 05:48:53 +0000
(22:48 -0700)
src/ChangeLog
patch
|
blob
|
history
src/image.c
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index a5e8eefbeef8cfcb8b00131b7e9448bfbdf5205e..e404cdbdb9f39fdb4db6d12a7847755b61638d20 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,3
+1,7
@@
+2013-06-28 Paul Eggert <eggert@cs.ucla.edu>
+
+ * image.c (x_from_xcolors): Remove unused local.
+
2013-06-28 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Defer image data transfer between X client and server until actual
diff --git
a/src/image.c
b/src/image.c
index 8381ce06b9356f8a7fd6b8343925fb2d13ff0c2f..04fec52df38aecdcbe5539be4baa46c3bbbd8caf 100644
(file)
--- a/
src/image.c
+++ b/
src/image.c
@@
-4657,7
+4657,6
@@
x_from_xcolors (struct frame *f, struct image *img, XColor *colors)
{
int x, y;
XImagePtr oimg = NULL;
- Pixmap pixmap;
XColor *p;
init_color_table ();